Code Clean up

Left the min versions and removed the debug versions and also did some
code cleanup for default controllers.