miscellaneous clean ups