Did some more source file cleaning and got compile to work