Code cleanup

Removed unused methods
Added serializable uid