house-keeping: removed irrelevent code