Reviewed code, added some TODOs	

Removed useless (because unused) classes.