Remove mainfile bloat