Feature/cleanup

Remove map dep