removing Faye and cleaning up