Took some stuff out that wasn't working