Removed some stuff 2.0