Add support for instantly on finish message
Remove no longer needed files