Initial cleanup. Modified core model to exclude search textfield