Cleaned up merged stuff