Removed lines of unused code. Ready for merge.