Before Bed update

Remove and find functions left