Remove code that is not ready to be used yet