Merged changes
Clean up