Cleaned up objects
Merge branch 'develop' into poc8