Remove these if we are not using them