Refactored: remove unused code refs #196