removed all dependencies and fixed bugs