Removed unused code and scrapped old ideas