Removed testing controller cleaned up controller