Removed JTattoo dependency