More cleanup from nalanda side