Unnecessary stuff removed