Finished hardcode removal