Cleaned up some code fail.