cleaned unneccessary codes