Simplifying the logic to remove extra files and code which isn't absolutely needed.