Cleanup, fix bug where full data was returned