Also Delete some unuseful code