Remove obsolete function
Re-order imports alphabetically