Cleaned up some unused methods