Removed some stuff taht will be replaced