Removed some unnecessary commented out code and a FIXME.
Removed a FIXME.