Issue fixes

Removed unused code and resolved issue with inspection submissions.