Removed unneeded class
Changing class analysis API to less restrictive parameters