clean from warnings and hardcoded code