Continuing grafting back processing and double checking use of statics, removing them where possible.