Cleanup a bit - Removed some commented parts not used anymore.
Removed useless since comment.