removed unrequired code