Cleaned up unused stuff in binding handler