Cleaned up unused code.