Removed stuff shouldnt be there