cleanup + removed warnings