TODO: remove stuff that has been done