Remove old code
Update demo and libs