Added some documentation, deleted a class..