Fixes extra semocolons from using decls

And disables some unused code to be deleted later.
Also suppresses the remianing warning: -Wreturn-type-c-linkage