Removed nodes and imports due to deprication