remove unnecessary file, fix use of constants