Cleanup - remove unneeded base-offset