Cleaned up unused methods.