More clean Up, Also need new API in SubmissionAPI