cleaned up some legacy code for source.rb