Remove old classes from Demo project