Remove failing constructor wrappers