Code cleanup, removed unwanted scrollview related