Remove unnecessary controller and implement deletes