Cleanup coments