Removed no longer needed utils and packages