Remove unused cubbies code
Remove unused beta code
Merge pull request #4736 from svbergerem/remove-cubbies

Remove unused cubbies code
Merge pull request #4738 from svbergerem/remove-unused-spv-files

Remove unused beta code