remove unused var, cleanup, use https :P