Cleaned out some methods no longer used.