Got rid of some unused an misleading stuff