remove auto loading and code improvement