#248 remove unneccessary code