removed obsolete event subscribers in 1.4; minor code cleanup