Remove obsolete code from checkin part of the app