deleted stuff we don't need and renamed stuff