Removing unused commented fields