removed unneecessary crap