Quick fix to remove unneeded stuff