Remove serializer stuff and add listener