Cleaned out commented code