Removed the unit test and some core function