warrnings cleanup