remove dist code from here, refer to gitraw