Removing old code structure.