Cleaned out commented out code