Fixes extra semocolons from using decls, and disables some unused code to be deleted later