Remove registration hack