Removed unused code and dependency