[Delete] non-OO code