[BUGFIX] Remove broken and unused class