Cleaned up and removed old lines from previous versions