Cleaned up unused method