More cleanup of files and removal of unused layouts