Cleaned up differences from dev