simplified by removing unwanted files