Removed some user-specific dependency