Removed unused helpers and specs