Cleaned up code; removed unused/commented out code