Removed obsolete code
Left overs from inital layout code.