Removed evil dependency