Cleaning the older code and transferring over new code + toolkits