Remove fin dependency on X/Y