Some dead code removed
Better runtime type management