Removes unnecessary code and shifts accordingly to the new workflow