Fix compilation. Also remove incorrectly added .o files as they do not belong here