all server side commenting and general cleanup complete