clean up + remove warnings