Source and imports cleanup