Code Cleanup (removed createObjectManually).