After a horrible experience with O3, I cleaned up my mainfile.