[Bug fixes] TDIS-6439, Removed application related code.