removed unused code
Merge branch '08-static'