Removed application specific code