Clean/less

Clean up