Cleanup, don't need this after all