try to remove more stuff