Removed non necessary code