Final removal of messy stuff