Cleanup + updated craftbukkit version