removed static vars from ps