Code cleanup/restart after new design