Code cleanup.
Merge pull request #3567 from Segrain/master

Closets and lockers.