Slightly improved signal callback
Added new source expressions
Remove obsolete file