Reviewed code, added some TODOs

removed useless (because unused) classes.