Remove unneeded code for comments