ALMATH: cleaning

Change-Id: I2cf5924eb81d98f72b5a855406d0227da7c8998a