Removed unused constructor/routines