remove 'ugly code' clause

ec981fc4d4f5312fb9dce6cd95f9b463efccd330 and 049a787b71ae4254371c069e4dcf99857be4c74f took away the bulk of the ugly code

Remaining low hanging fruit is located in PostAssignmentActivity (and is in issue tracker already)