trying to remove some stuff but not finished yet