removed unneccessary codes