Cleaned out some unused code