Code warnings cleanup 7th phase : remove usage of auto generated method and cleanup unused code