Remove static