removed some code we don't need