Updates

Clean up