clean up, remove warnings