Removed commented-out code
Verion 0.9