Remove useless inline functions
Update Makefile