Cleanup and get rid of warnings