School removing functionality added... and working fine