Deleting unused stuff result in a performance improvement and code cleaning