done some cleanup on no-longer-needed things