remove old code structure