Delete unnecessery files
Code review fixes