Feature/cleanup cleanup