Removed objects that are not required
Merge commit 'c648323afb489c972b449116adfa7f8e9815cefa'