Fix startup and remove gross hack.