Removing deps to improve compile time