post-bs cleanup