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

Remove unused cubbies code