CDB-2863 deleted obsolete spec, checked others so they work properly and...

CDB-2863 
Deleted obsolete spec, checked others so they work properly and added to MakeFile