[19] Solved problem 19
- also removed obsolete code from problem 12