paring donw unnecessary stuff