Cleaned up unused portions of binding handler