Removed unrequired code