Cleanup lib/includes/serializers

Change-Id: I776358b0b9dbfcc0b525c8d6aef0a135d2d119b2