Cleaned up old unused code.