Removing commented out code, fixes #94