Files cleanup

Would be nice =)