Removed FIXME messages and commented out code