Removed some unuseful code from files