Minor cleanups

Added -feature to get rid of an existing feature warning and removed existing reflective calls