add active model serializers; cleanup