[#54] Remove old code