Removed loads of unused stuff, thus resolving #3.