cleanup. bux fixes