Removed some useless elements