fix constraint layout exceptions; remove unused variables