Remove old code
v1.4.7 Update