remove magic entry point
remove some magic parts