Useless ObjectLess class removed
Merge branch 'housekeeping'