Some hardcoding removal