Update fs spec and remove dead specs