[Bug fixes] TDIS-6439, Removed application related code.
Merge pull request #249 from jacobchen/next

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