Cleaned up code, removed old lines