Code cleanup.
Implemented remove and get layers.