Removed redundant controllers & specs.