Remove static for now