Removed cruft from main