Removed unused code
Unify error strings
Masters thesis 28.9.2013