Remove static functions