Initial specs clean up