Commiting changes which delete unused, commented invariants for clarity