Rolled back auto-setup

Code was a bit too cluttered and stuff, going to re-add this in a future
update.