Cleaning up spec includes