added a header
deleted deprecated stuff
Merge branch 'develop'