cleaned up code we (hopefully) won't need anymore