Removed dependencies to user library