Remove Content interface
Revise based on feedback