Remove a few lines of unrequired code