cleanup for conversion to gem
cleanup for conversion to gem