remove more nonsense :D