src cleanup, notification fixed