remove stuff we don't need
restructure