Remove commented out code and related FIXME