[Cleanup] fmal code since it never worked anyway