removed all unnecessary stuff