Remove core patch and specify core version in makefile