cleaned up old methods to make room for spec system