Removed some unused code too. That call wasn't really doing anything.