Clean up from offline branch fiasco