Removed uneeded layout and js functions