Revert "Revert "Removed unused objects""

This reverts commit f08e1370c897e1885679a995f206e537934b3511.