removed unneccessary stuff