Clean up. Removed unused method