20140426-2006. clean up objects class