cleaning up too many commments