Finished Thurston obstruction cleanup