Removed testing code, this really needs a dev branch...