Attempt to clean up functionality.