Removing comments for the 'old api'