Removed useless common file and updated etc files