Clean master

@electro1rage