Cleaned up unused methods