Cleaned up surveys plugin