Remove old registration system & Code cleanup