Deleted a file

This should conflict with master