Further code cleaningand excluding files