cleanup and path fix