Removed redundant import
Removed defunct functions
Updated to accommodate keys due to new options