Cleanup, remove warnings