NEXUS-6045: No code change

Just removed remnants, commented out parts and some
formatting