Other Files cleanup