20140426-2051. clean up objects class