cleanup + remove warnings ...