Fixing logic with pre-trial/post-conviction.
Removing unnecessary file.