cleanup & Makefile static lib