Fixed speed issues with problem21 and removed a solution which was slow.