Removed some more unused code
Moved smis time functions to separate file.