Should have removed everything now