Various cleanups

Remove unnecessary _marshal attribute