Upaded fail message, removed unused code.