Unnecessary stuff cleaned