Improved functional spec file; others removed