Removed unnecessary code, fixed E_USER_ERROR