Feature/friday cleanup time