Removed dependencies on X