Cleaned tapkee methods