Removed some code that was not necessary.