Removed some cruft from main.