remove empty fields
remove username from requires
cleanup and consistency with plugin code