B268 Updates and some cleanup