Clean up unused methods