fix static duration, and unused function

This removes an unused method and defines more things to be static.