Fixes
Comments removing