Still cleaning up static mess