Building controller cleanup