Mini changes
Removed file
Various update