Merge "MAP: Remove redundant cleanup() method"