cleap up controller crap