[IMP] Removed object instances
[FIX] Minor changes