Removed the nonweb stuff