More cleanup of un-used bits