Removing some code for demo page