Removed some remnants