Minor updates. Removed functions as it's never been used.