Trimming

Only the code is here now