remove stuff i consider pointless (for now)