Cleaning code first, removing dependencies