Remove more unnecessary stuff