Proper response returns, v1.0 cleanup