Removing unnecessary singleton