Cleanup and updated package json