removed all that unnecessary stuff