cleanup & license headers