Made reference optional, removed uselesss file