Remove remaining classes logic from main.rb