removed unneccessary things