Remove inline object instantiation