Remove more stuff and fix compiler error