cleanup, removed warnings