Some cleanup, remove unused package