MVP almost done - removing users is buggy