More profile cleanup