[delivers #63512694]

removed about 3 hacks from before to clean them up and also removed
duplicate controllers to stop from running twice, removed init
functions, removed unused variables and overall code cleanup