Merge "Remove unused init file and directory"