Cleanup and remove warnings