Clean up: constants pragma marks removal of commented code