Fixing uneeded elements