Undid some useless changes