removed unneccessary dependency, clean up...