#8 Remove a rest of real project code