Removed unneccessary ObjectHolder