(nearly) all dummy methods removed