Return proper values on error or success
Remove unneded header