Removed dependencies on spf13