Misc. cleanup

Just doing some housekeeping.