Remove static references