cleanup, solved warnings