Removed some code that seems useless