Remove static call