Remove more stuff
fixed build