Remove static calls