Removed all finish files and reworked runactivity etc