Remove unused code
Add semester param - Fixes #103