Remove unused cubbies code