cleanup

Preparation for demo