Removed commented code (closes #8)