Cleaned up unused controllers