Fixed support page path
Remove unneeded function
more renaming