Remove somes static calls