Removed useless code and dependencies