removing old code structure