deleted unnecessary stuff in code