Remove some stuff...add some stuff
Signed-off-by: PipelinerArd <kristoferard@gmail.com>