removed unecessary jars, and some small code changes