Wee-Cleaned up unused code.