Cleaned up old commented code