Comments and whitespaces, remove unnecessary file