Removing classes from calculate which are now located in other packages.