Added an empty __init__
Removed some commented out entries