removed code bloat in server task
reworking demo api