Cleaned out unused code and layouts